Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

optimize engine cache checker #542

Merged
merged 1 commit into from
Jan 26, 2022
Merged

Conversation

DuodenumL
Copy link
Contributor

#539

P.S. 应该是因为我之前有个改动提了2个PR,分别到master和v21.01.05的某个alpha版本,导致直接git rebase v21.01.05再提PR出现一大堆commits,感觉这样是不太合理的。以后应该只提1个PR到alpha版本,等QA测完了再合并到master去。

@DuodenumL
Copy link
Contributor Author

这个PR #541 可以删掉了...

@CMGS
Copy link
Contributor

CMGS commented Jan 21, 2022 via email

@DuodenumL
Copy link
Contributor Author

求Merge

@jschwinger233
Copy link
Member

可以直接从 branch merge 到 master: master...v22.01.05
你看看是不是一样的改动
不过为什么有冲突..

@DuodenumL
Copy link
Contributor Author

可以直接从 branch merge 到 master: master...v22.01.05 你看看是不是一样的改动 不过为什么有冲突..

试过,可能是因为我之前有分别在master和branch各提了一个PR,虽然改动基本相同,但是commit id不一样,导致不能顺畅地rebase...

如果是这样的话,以后的hotfix / patch我就只先提PR到branch,然后通过测试了再rebase到master上去,应该可以避免这种问题

@CMGS
Copy link
Contributor

CMGS commented Jan 26, 2022

so what should I do

@jschwinger233
Copy link
Member

留给老板点合并 这样github profile里的contribution会比较好看(

@CMGS
Copy link
Contributor

CMGS commented Jan 26, 2022

我的十字架从 100% commit 变成了 100% review……

@CMGS CMGS merged commit 80fcdb5 into projecteru2:master Jan 26, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants